Autogenerated HTML docs for v1.5.5-rc0-16-g02b0
diff --git a/git-rebase.html b/git-rebase.html index df59b64..4dbb00d 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -618,6 +618,18 @@ branches. </p> </dd> +<dt> +subtree +</dt> +<dd> +<p> + This is a modified recursive strategy. When merging trees A and + B, if B corresponds to a subtree of A, B is first adjusted to + match the tree structure of A, instead of reading the trees at + the same level. This adjustment is also done to the common + ancestor tree. +</p> +</dd> </dl> </div> <h2>NOTES</h2> @@ -831,7 +843,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 11-Mar-2008 22:49:45 UTC +Last updated 19-Mar-2008 09:24:07 UTC </div> </div> </body>
